From 23e2593b6dc5954e8d4a68d8b19d71434c451c91 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 30 Aug 2013 10:50:29 +0200 Subject: [PATCH] repo: Use non-deprecated API with sufficiently new libarchive Based on a patch Tobias Hunger --- configure.ac | 4 ++++ src/libostree/ostree-repo-libarchive.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/configure.ac b/configure.ac index cd0d0657..74df7b4a 100644 --- a/configure.ac +++ b/configure.ac @@ -100,6 +100,10 @@ AS_IF([ test x$with_libarchive != xno ], [ AS_IF([ test x$have_libarchive = xyes], [ AC_DEFINE(HAVE_LIBARCHIVE, 1, [Define if we have libarchive.pc]) PKG_CHECK_MODULES(OT_DEP_LIBARCHIVE, $LIBARCHIVE_DEPENDENCY) + save_LIBS=$LIBS + LIBS=$OT_DEP_LIBARCHIVE_LIBS + AC_CHECK_FUNCS(archive_read_support_filter_all) + LIBS=$save_LIBS with_libarchive=yes ], [ with_libarchive=no diff --git a/src/libostree/ostree-repo-libarchive.c b/src/libostree/ostree-repo-libarchive.c index e06092a4..7c0348e9 100644 --- a/src/libostree/ostree-repo-libarchive.c +++ b/src/libostree/ostree-repo-libarchive.c @@ -305,7 +305,11 @@ ostree_repo_stage_archive_to_mtree (OstreeRepo *self, gs_free guchar *tmp_csum = NULL; a = archive_read_new (); +#ifdef HAVE_ARCHIVE_READ_SUPPORT_FILTER_ALL + archive_read_support_filter_all (a); +#else archive_read_support_compression_all (a); +#endif archive_read_support_format_all (a); if (archive_read_open_filename (a, gs_file_get_path_cached (archive_f), 8192) != ARCHIVE_OK) { -- 2.30.2